auto merge of #495 : alexcrichton/cargo/issue-492, r=brson
authorbors <bors@rust-lang.org>
Wed, 3 Sep 2014 03:49:07 +0000 (03:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Sep 2014 03:49:07 +0000 (03:49 +0000)
Closes #492


Trivial merge